From 7554770de6e2ca760551f318a24369a237f65ff6 Mon Sep 17 00:00:00 2001 From: "cl349@freefall.cl.cam.ac.uk" Date: Wed, 21 Jul 2004 09:54:10 +0000 Subject: [PATCH] bitkeeper revision 1.1108.2.11 (40fe3d42Zl0VaD6XCO_s716MYM1VIQ) Make the network interrupt handler work on 2.6. --- linux-2.6.7-xen-sparse/drivers/xen/net/network.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/linux-2.6.7-xen-sparse/drivers/xen/net/network.c b/linux-2.6.7-xen-sparse/drivers/xen/net/network.c index ea0fa45f03..51646e9c8f 100644 --- a/linux-2.6.7-xen-sparse/drivers/xen/net/network.c +++ b/linux-2.6.7-xen-sparse/drivers/xen/net/network.c @@ -371,7 +371,7 @@ static int network_start_xmit(struct sk_buff *skb, struct net_device *dev) } -static void netif_int(int irq, void *dev_id, struct pt_regs *ptregs) +static irqreturn_t netif_int(int irq, void *dev_id, struct pt_regs *ptregs) { struct net_device *dev = dev_id; struct net_private *np = dev->priv; @@ -384,6 +384,8 @@ static void netif_int(int irq, void *dev_id, struct pt_regs *ptregs) if ( (np->rx_resp_cons != np->rx->resp_prod) && (np->user_state == UST_OPEN) ) netif_rx_schedule(dev); + + return IRQ_HANDLED; } -- 2.30.2